fix for #21