r1168 Patch from Aaron Dummer (aaron@dummer.info)