See here https://github.com/KSHSK/WAVED/commit/d7dd9b98f2df3223bf96696a57300be2a9ca11c7 for a way to do this that looks a bit less weird, but might have some implications on similar fields elsewhere (as in, we might have to do it for them).