Add an enhances control spaces fixer