Quick fix for #1