Fixing issue with multiple initializations;