Ensure proper initialization