Fixes #629 Select from Buddies not working