(is this also the long term fix? seems like there should be a migration or something)