Fixing Issue_407

Hi There,
I'm sending out this pull request to address issue 407