partial fix for --execute action