Fixing Fault handling