Fixed constructor issue