Quick fix for #173