GRECLIPSE-1776 Fix and test
Merge pull request #85 from DenisMurashev/GRECLIPSE-1776

GRECLIPSE-1776 Fix and test