Add key so it can handle key fix