bug fix on the way