Fixed #909