BS3 Migration issue fixed