Removes synchronization to prevent deadlock
This closes #199