does anyone see an easy way around that without rewriting aload of checks and the loop itself?