Ugly attempt to fix the initialization problem