bug fixes on weighted choice issue