Fixing initialization