GUI-1351
coverted for-loop to angular.forEach. Seems to help, but not conslusive