fix for 475/476