This resolves #2