fix for infinite loop on tier