WORDS-8 Bug with Hashmap Treemap fixed!

WORDS-8 Bug with Hashmap Treemap fixed!