partial #1264