Probable fix for #24