buggy handling of fl quirk fixed