fixing command handlers