resolves #501