Provisional fix for #10