Fixes issue-225