coba saja commit #TS-1 fixed