Fixing initialization bug