Fixed KeyNotFound exception