Temporary fix for issue #3 and added a new test-case for this issue.