Security fix by jwise