remove condition for mem leak