Try to fix synchronized map bug