Fix zoom/pan/drag issue