@hayd I actually think this is a more general issue; your hack ok for now....