HADR fix