BC-1296 #comment fixed some missed