Fix for issue #286