Fixed #246