fixed broken picking