CommandHandler fix