Fixes getAll method