Revert "- invalid state - : synchronization"

This reverts commit 21e55a9717d51e8f36eefff8ff9c6dca7c2ac15e.
bugfix: a lot of them