fault tolerance improvement and bugfix