phase 1 bug fixed