BC-1354 #comment
Fix some miss.