potential fix for #10