Fixed broken retrieving