Fixes # #### Short description of what this resolves: #### Changes proposed in this pull request: