Fix the '?' issue