tweak #495