#643 polished