Marc: Bug fixed in dropdown