attempt to fix "bare references to struct types are deprecated" warning