ok, another ugly try to make it correct