Fixed #258