Hot fix for non-existing model classes in RB after Flight update