fix redundancy;