very big fix, now right behaving