fix for problem with master merge