817eca811d
Slight modification of patch by wollman. Closes PR#2870 Reviewed by: wollman Submitted by: Marc Slemko <marcs@znep.com>