fix for weird extra executions