Fix issue with initialization.