@ line: some bug fixed