Should this be fixed now, or later?