Another constructor fix