BZ-12232 bug fixing item 4