This will hopefully fix both builds