bug fix for the last bug fix