Fix commands parsing.