Pull Request for Issue620

I was just removing them on my side.