add momentaneus hack for loop