Fixes picking