Fix for key index field values
Merge pull request #666 from ExchangeCore/Fixes-616

Fix for key index field values