bug fix; initial data