ticket:5: initial_data fix