Patch submitted by Andy Schmidt for AXIS2-5329