Redundancy Fix From Last Commit