Changed the eorr handling