work on #1351, backup