fix for #25