Fix for bug #403 (new patch)

Please ignore white space changes.