quick fix retrieve bug