Fixed race conditions with merle code again