fixing constructors