Improve a2c31c8 per #255 by Derek DeRaps