Candidate fix for #20