Quick fix for #109