Fix to use our own method