see prev commit for #26