Fix an issue with uninitialized instance variables