Fixes #980 (proper constraints in move mode)