Minor change
Improve performance
Same behaviour when running step by step & complete run