Fixed issue in #1010, #1012

All is good now.

All in one commit.

No copyrighted content...

>insert slightly insane facial expression here