fixes
Loop pull from Dorimanx
merge