Fixed #96
Fixed #97