Part 2 of public image fix