Restores Feature #587