uninitialized struct members: improved fix