BC-2427 #comment bug fix