Obvious fix, closes #42

Also implement back compat default per my comment on #42.