Should this be fixed before release?