Fixed synchronized, need some tests