fix bug completed v1