MattMoveFix: Merged fix.