fixed the constructors