quick fix for #397
Merge branch 'jackyzy823-develop' into develop
* Fix #397