Fixed #71
Fixed #73