Fixed looping graphic issues