Fixed #88