fixing issue 540
Merge pull request #541 from vihuvac/master

fixing issue 540