2.6 bug fix (for unanswered questions)