general fix for #70