Outdated comments due to #183 / #184