(Fix #168) Removed loop problem