fix: Fixed uninitialised fields