Tweak to command handler.