Further fixes like #1377

Should have read the whole page before submitting the PR, I guess. ;)
Merge pull request #1378 from perlun/patch-13

Further fixes like #1377