fix pahse 2 & 3 #171

Closed yosuasentosa closed 3 months ago