Probably fix #1509.
baby we have proc for this.
Merge pull request #1961 from eswordthecat/patch-8

Probably fix #1509.