Fixed loops hopefully