Security fix + little improvement