Second half of fix for #159