Final fix for #10