use CALL_COMMAND_HANDLER instead of direct calls