Fix for issue #955
Added test case for the fix
Removed incorrect import
Merge pull request #1215 from harishnsrinivas/fix_for_#955

Fix for #955