potential fix for #2