A final fix for the mess from hell

Iasu manually merged with a deformed master