Fixes #1722
Fixed formatting
Fixed formatting... again
Trying to fix formatting still...
Merge pull request #1780 from toriverly/issue-1722

Fixes #1722