The previous patch is missing some parts, add it.