Better fix.
more tests