Issue #6: fix dodgy build