Race condition
Fixed mismatched mapping