Fixed constructor again