BUG: remove return for loop