Fix method duplication