This should be a feature..