Pull Request issues #423.

Commited #423 after modification bug.