Rapihin dan benerin bug dikit

Signed-off-by: Yosef <yosefsukianto@gmail.com>