Seems like this fixes #70