bug: Optinal field initialized to null - fixed