reverted critical error change