Fixed #141