Fix question mark bug