Fix (in FW) for SW-7.