A fix for FEND-835, I think this captures all of the use cases