Fixing closing move bug