Implemented workarounds for #1432 and #1699.
Merge pull request #1761 from pjackson28/v3.0

Implemented workarounds for #1432 and #1699