Fixing "professional judgement" and None