Think I've sort of fixed this now. Was a pretty funny edge case caused by the migration but it should be fine going forward