1.0.17 bug fixes
1.0.17 bug fixes