follow uo fix: TRUNK-301