Marc: Bug fixed on dropdown