fixed issues, stored nil to dictionary