[FIX] fixed issues with b3 changes of swift