Winding bug fix when first command is not M