implementing fix for #26.