Solve duplicate bug