bug fix: wasn't handling integer generated keys correctly