Fixed duplicate methods