Avoid redundancy; fix