Fix for #26.