Hopefully resolves #36