added faheems patch