Refactored fix