Remove bug in 'typeModel' when data has compound key