We are doing exactly the same thing here and I hate it, too.