Fix type guessing