Fix concurrent modification exeption JIRA/BZ