Proposing my workaround, by adding guard variable
Merge pull request #1236 from erp-lsf/#1207

Proposing my workaround, by adding guard variable