Probable fix for #123 and #105