Potentially resolves #49