fix for changes to refactoring contructors
10 files changed