Issue 347

Get build working again