Fixing for BS3 Classes