Fixed method conflicts