marking changes moved to separate thread
bugfix