Fix issue 190