Fixed #107