Fix for #266.