bug fix from chris