Fixed #323
Merge pull request #325 from frmwrk123/fix/323

Fixed #323