Commands fixed