issue 545 and 1013

do one constructor