fixed huge move bug