Redundancy fix