Might have fixed an hidden bug under concurrent conditions