Pull Request for Issue620

Fixed it up. Thanks.