Late constructor call fix