include tweak #532