fixed for haroopad