Fix the case where a subform is created later