Fix for #223.