commentable bug fix