Not happy with a solution that works 99.99% of the time?

Will fix.