fix 9924

BS3 commit d924bca6f6a7184fdaa23476554321e2c7e088a7