Fixes #71 - some crazy races inside erasure and simplify the code