changes to F24 in keeping with LC-2906 resolution