Fixed #286