Fixed so key is always a string