Make Pull Request issues #422 after modification bug.