first fix for #15