resolves #474