Fix broken field inheritance