Fec 1214

Fix to FEC-1214