fix project imports on some systems
fix ConcurrentModificationException (thx @xGhOsTkiLLeRx)