Merge pull request #309 from jdgleaver/negcon-fix