temp update between v1.38 and v1.39
fix some bug between v1.38 and v1.39
version 1.39