fix to BC-4.2.1