Fixing Choice class to work with BranchPage.