fix bug forge 155644