fixes ISSUE-2