Fixes ISSUE-45