Fixing #1060

Adding to the fixes submitted in commit 5b55115c425b4b08225ea7814070da793d442109
1 file changed