Fix for FW-40.