fix for #16