Fix for FW-44.