Add slightly more protection