fix merge for #80