Move spaces fix on next releases