getting close to fixing the zoom bug