fixed concurrency problem, fixed subscription