Fixed #259