+ Bug fix in constructors