Fixed the gmf-on-the-fly functionality