Fix for FW-52.