Fix to recent over change