Fixes issue-155