ERB_GF - Generalize the BugFix solution