Fix for smart store key generation