Is this something we're going to fix?