Fixed #260