better fix for 2208