Issue #PE-75: Fixed execution order bug.