Pull Request for Issue620

Fixed.