Fixed method implementation