ticket:5 fix initial data