Fix commands feature