Bug fix for partial names