bug fix #5096
Merge pull request #76 from vanilla-thunder/b-dev-ce

bug fix #5096