modifications for #84