Fixed a bug created by the PR #1