Fixed #149