Fixed #113