Change signature and fixe a bug.