f18-beta-branch re-fix