Command handler should be fixed.