Hems added fix for view