Fixed trailing '?' bug