Fixed issue #7: Key truncated