fix loop issue kind of
merge