bug fix - maybe