Solves #191 for me anecdotaly, but I don't know if there's a better solution or a different way to go about it.