fix for onMove