Crazy fix for #10