fix issue #22 for v0 branch @brianr