Fix for FW-184.