Corrected some issues in 69ca0aa and 446ce4a

Signed-off-by: Haru <haru@dotalux.com>