added mlandauers patch