Candidate fix for #258.