COMP: Again ZeroValue error

Change-Id: Ib05df66067d4a04be2d21cb096ecc3dd92b41e5e