Fixes issue # Proposed changes in this pull request: - -