Updating the fix of LB-167
Merge pull request #136 from iuj/master

Updating the fix of LB-167