FW-292. Fix for FW-296.