Fix keys issue