merge problemGeneratorBugFix into master