KeyNotFoundException fixed