Refactored zoom fix