Bug fixing some commands