Bug fix for v1b
another bug fix for v1b
Merge branch 'v1b' into v1