some dummy fix, I really need to had some tests ...