Encrypted Relay bug fix