Fix commands!