fix for exceptions