temporary fix, until i can think something else