Pull Request for Issue620

Done.