Fix issue 192