#21: forgotten function replacement