tweak #1570