Fix redudent redundant work