Attmpted fix for #70