Bs3 fix