fix gulp into 2 steps