Fixed #244