Really fix #302 and #323.
Merge pull request #329 from gjb2048/master_dropdown

Really fix #302 and #323.