better fix for 8377e9d413