Quick fix for #16