update after #1539