fix bug
r006
r008