Fix issue 198