Fix single-space moves