#7 detect and fix