Oops, open PR again

See #454