Fix for a feature that may disappear