Fixed move func