serialization fix
retarded bugfix
deadlock is somewhere