bugfix in pick mode