Some cleanup and a try in a comment... no clue atm... Maybe someone else?