fixes #issue-5