superstable hotfix in de master branch