bandaid fix for #841