fixes 8216

BS3 commit fc8f4f04652f6fb29657969f7ea6f167635fd01f