Fix Issue with setting modes