Hyperion: fix resolution issue between resolve and execute