Hotfix/custom action delay