Fix/set nil to dictionary