xss fis
memleak temp fix