Fixed duplicate method