working-beta-fix1