Fix delayed move