fix from BS3 commit 92977fb