Fixed constructor handling.