resolves #92, #89