Fix the model. Hashability problem remains