Fixed #96