bugs fixs