attempted fix for #2004