fix commands bug