ok, kind of fixed.... not sure it's the best solution