serious bug fix