Better handling of FC code