<riya/apurva> bug removal