Fix commands ignore instance number