Fixes issue-8