I think this fixes #76