fix getAll method