A bit of rework done and breaking now works properly!