Fixed race condition and added report