ticket:2 models fix