ticket:13 fixing model