Issue#638

Closes #638