fixed execution logic