bug fix ???