Corrected constructor