Fix issue 186