Final fix for client class select menu