Fix for FW-187.