David M. Lloyd suggested a third, simpler fix.