remove duplicate methods and use the not-buggy one, again