better fix for bug #954173