Fixes #SOME_ISSUE_NUMBER Changes proposed in this pull request: - - -