fixed issue loop