This will have to be thought out more. The old version worked fine 99% of the time so we'll revisit this.