Fixed loopification from previous commit