Fixier fix, with proper tests.