further bug fix