Add proper initialization (fix previous commit)