See if this fixes our issue