I think if you use the wait that dave suggested in pull #515 then this will work fine.