Fixed as per PR comments