Fix bugs when release
Fixed Bug from release #2