Big fix to initialization.