Second try to fix custom actions