phase1: fix issues in previous commit