Swift B7 Fix