Apply Leandro's patch for startOnFirstThread bug (MOJO-1559)