Fixed #103