Fix error caused by pull request #2