__construct fixed