Fix to avoid redundancy