Applied patch from branch issue#8