bug fixs