Changes necessary for lccp pull request #718