Fix: convert int keys to str