#682: polished