#626: polished