Fix issue 174