Bug fix to Type selection