This time I'm fixing things AND breaking things ;)
and everything is fixed back!