Ah that's better, the hash approach seems contrived now - will add this patch tomorrow.