fix issue with class ordering