fixs bugs
fixs bugs