Fixed retention policy issue