1.0.38-dev bug fixes
1.0.38-dev bug fixes