PLXCOMP-254 fix with testcase