EAGLESIX-812: Fix potential regression with key values