Fix for new action system