Fix Issue279

Namely, #279.