Temporary fix for #216
Also: really fix ambiguity warning.
Merge pull request #217 from kmsquire/temp_fix

Temporary fix for #216