bug fix unanswered questions