There was a race condition in the original
implementation. This fixes that issue!

(and makes the code cleaner!)