[BUG] Security fix