small step towards #46