I must be tired to have missed something this obvious!
The problem has been solved.
Thank You Henrik!