bug fix for commands mess up