Candidate fix for #70