BS3 migration and issue fixed (NIT must be for validation)