Small bug fix that keeps getting undone in Move