Fixed duplicate method calls