Pull Request for Issue620

COC!