> I have the feeling option 2) does not work for you, but I don't yet understand your reasons. My inclination to prefer #1 is due to its simplicity. But, if #1 does not work because it creates a correctness problems then #2 is the only option that is left on the table.