Addition to Tox/toxic#235