Actually fixed #87