fix for #26.