Fixed issue 7 - integer keys causing data duplication.