Merge pull request #183 from jdgleaver/negcon-fix