first attempt towards #754