Fix issue breaking model inheritance