Fixing loop/ default markup