additional bug fix