updated master hotfix / unstable