bug fix to previous