Fix byclass organization isolation