fixed issue 409
Merge pull request #470 from safiyu/issuesnew

fixed issue 409