Minor change on destroy method to avoid ConcurrentModificationException on rare condition
Update build # 1828