hotfix on rb1.1