Quickfix for issue g1_class_updates