Fixed question mark issue