redo after pull request #16