Test and fix for #135.