Fix except clause