#695 polished