Security fix that works