ticket:1 models fixed