Fix issue 185