Broken Image fix from Flywheel transition