Temporary fix for #216

Also: really fix ambiguity warning.