Hotfixs + comment + divers