Fix after boot thread-safety issue
Merge pull request #585 from SPBTV/thread-safety

Fix after boot thread-safety issue