FIX: One more reference that didn't check for Type