Fixed #81