Fix bug introduced by #236

RM9709
Merge pull request #245 from asadoughi/9709_second_attempt

Fix bug introduced by #236