Constructor fixed