Some bugs fixed

Signed-off-by: Dojisung <dojisung0@gmail.com>