Bug fix for dropdown options