Fixed #141
Tweaked #128