Resolves #134. See my comment in the issue for further information.