fix custom action support (not tested)