Hopefully this will make it bullet-proof.