Make the change of PR #60