enhancement, see #22