Fixed #85