Fixed small bug with duplicate definitions