#2552: Polished