Applied Tony's second commit (08ccbd9af16e6bc8875f5e13bfcf47b6c1b67d3f).