temporary fix for mem issue