bence changes 2302_fix