I desided to try and repair the thread-safety in handler class, which may naturally break the whole project for a time (again).