Fixed duplicate method bug