Fixed throws errors