Fix issue 84 -