Hey, sorry for the delay,

We need to fix this and I'd rather prefer the latest proposition @astephens25 provided

Could you update your PR ?