Hopefully this fix works