Solves for issue #401
Merge pull request #413 from voodootikigod/voodootikigod-parity-fix

Solves for issue #401