fixing issue FW-82.