Fixing fault handling