Fix Issue279