Fix issue with initialization