Fixes # Changes proposed in this pull request: * * *