This is my first pull request!

Sometimes things get complicated.