fixed where
refactored
None