BZ-12232 bug fixing