Fix issue 183