Fix commands bug