fix hotfix for master