initial bug fix