Fixed issue #96 Nissa's choosen