Fix based on CR WIP