possible fix for concurrent problem