fix redundancy