Take care of trailing question mark