Quick fix for #199