Fixing as per PR comments.