d266: merged Artifice's pull request #144