Corrected bad behaivor on double execution