Actually fixed init. bug