Added patch from Don Hejna <djhejna@oasis.ambit.com>.