Fix issue #286