Wasn't sure what the CountdownLatch was all about, didn't want to mess with it. Your suggestion works fine, I'll check it in now.