Change made for FC023 was causing resource to be defined twice, which is not what we want