fabricecaruso Fix : Per system Emulator/core selection not working anymore