#782: Polished