Fix logging duplication