Fixes #342
Fixed #92