Fixed #279