Fixed #77
Fixed #76