Fix initialization problem introduced by 2f14f52e24b35