improved fix for #4158 etc, hopefully