2.5 patch 1 - Add choose handler