resolves #484