finish this fixed #1

lalalalalala