Probable fix for #18.