Tweak to clean up question marks which are mysteriously cut off otherwise