this fixes #87, #91