Fix collusion issues