Heitcamp, Fixes #40