Fix for #416.