Fixed duplicate bug