Preventing ConcurrentModificationException crash!

This should fix issue #2