Fix commands indices