Fix for loop support