Fix #554 execute action behavior