Quick fix for non-confirm actions