FIX expanded FIXME comment