1.0.36-dev bug fixes
1.0.36-dev bug fixes