Pull Request for Issue620

Commented out code reminder.