I think this fixes our issue?