temporary fix for infinite loop