Put back correct constructor handling.