fix for UT failure, caused by previous commits