Fixed #110 and Fixed #101