#832: Polished